From: Alex Williamson <alex.williamson@hp.com>
Date: Thu, 5 Apr 2007 15:13:16 +0000 (-0600)
Subject: [IA64] Auto setup serial console on PRIMEQUEST
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15269
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=7a7063ac5ab82f506362fb4e4fee962168b703a6;p=xen.git

[IA64] Auto setup serial console on PRIMEQUEST

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
---

diff --git a/xen/arch/ia64/linux-xen/setup.c b/xen/arch/ia64/linux-xen/setup.c
index 362de5e7da..b284c13527 100644
--- a/xen/arch/ia64/linux-xen/setup.c
+++ b/xen/arch/ia64/linux-xen/setup.c
@@ -316,7 +316,7 @@ io_port_init (void)
 
 #ifdef XEN
 static int __init
-intel_tiger_console_setup(void)
+acpi_oem_console_setup(void)
 {
 	extern struct ns16550_defaults ns16550_com1;
 	efi_system_table_t *systab;
@@ -353,8 +353,17 @@ intel_tiger_console_setup(void)
 	if (strncmp(hdr->signature, XSDT_SIG, sizeof(XSDT_SIG) - 1))
 		return -ENODEV;
 
+	/* Looking for Fujitsu PRIMEQUEST systems */
+	if (!strncmp(hdr->oem_id, "FUJITSPQ", 8) &&
+	    (!strncmp(hdr->oem_table_id, "PQ", 2))){
+		ns16550_com1.baud = BAUD_AUTO;
+		ns16550_com1.io_base =	0x3f8;
+		ns16550_com1.irq = 48;
+		return 0;
+	}
+
 	/*
-	 * Only looking for Intel Tiger systems
+	 * Looking for Intel Tiger systems
 	 * Tiger 2: SR870BH2
 	 * Tiger 4: SR870BN4
 	 */
@@ -402,7 +411,7 @@ early_console_setup (char *cmdline)
 #endif
 
 #ifdef XEN
-	if (!intel_tiger_console_setup())
+	if (!acpi_oem_console_setup())
 		earlycons++;
 #endif
 	return (earlycons) ? 0 : -1;